Remove rust toolchain channel check #848
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ascjones
commented
Dec 2, 2022
| @@ -101,9 +75,6 @@ where | |||
| cmd.current_dir(path); | |||
| } | |||
|
|
|||
| // Allow nightly features on a stable toolchain | |||
| cmd.env("RUSTC_BOOTSTRAP", "1"); | |||
There was a problem hiding this comment.
This is only required when doing cargo build so have moved it to exec_cargo_for_wasm_target.
| let meta = rustc_version::version_meta()?; | ||
| let min_version = Version::new(1, 63, 0); | ||
| match meta.channel { | ||
| Channel::Stable if meta.semver >= min_version => Ok(()), |
There was a problem hiding this comment.
This min version check can be replaced by adding rust_version to the ink crate, might be a more suitable location for it?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@HCastano reported the following error when using
cargo +nighlty testfor E2E tests using the newcontract-buildlibrary. First of all the error is misleading and is an occurrence of #746.The issue is that the
+nightlygets inherited and theassert_channelcheck fails. This PR removes this check entirely and allows the underlyingcargo buildcommand to inherit whatever toolchain the user needs. It still does addRUSTC_BOOTSTRAPin case we are building withstable.This should now be more in line with
cargophilosophy and give more flexibility to contract authors with their toolchain management.See also #698 where stable toolchain was first introduced.